Merge changes from topic \'qs-tiles\' into nyc-dev am: 321d450 am: 60b8a7b

am: e0679c4

* commit 'e0679c419f864acc063332d4ca7f9b13cc20405e':

Change-Id: I78740186c6f9b8cb506a9091e108c462084268c9
This commit is contained in:
Dan Sandler
2016-04-25 19:45:46 +00:00
committed by android-build-merger

Diff Content Not Available