OSDN Git Service

Merge changes from topic \'qs-tiles\' into nyc-dev
authorDan Sandler <dsandler@android.com>
Mon, 25 Apr 2016 19:28:22 +0000 (19:28 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 25 Apr 2016 19:28:22 +0000 (19:28 +0000)
commit60a2e4d0167300a2f0c06f10b5600386f488c482
tree7448e8a3742fa03abe237d730121d0d6dee459e1
parent185bfdf3a57beb1e22e734a1095dacfb8307bf94
parent321d45031bd93e05ffba4c8aedbac5dc41436bae
Merge changes from topic \'qs-tiles\' into nyc-dev
am: 321d450

* commit '321d45031bd93e05ffba4c8aedbac5dc41436bae':
  Developer QS tile: GPU Profiling.
  Developer QS tile: Show Layout.

Change-Id: I96b3eb012d3663d1c517aa53976a7ffd70d67c60
AndroidManifest.xml
src/com/android/settings/SettingsActivity.java