OSDN Git Service

Merge "Index the System status page" into oc-mr1-dev
authorMatthew Fritze <mfritze@google.com>
Wed, 13 Sep 2017 08:38:40 +0000 (08:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 13 Sep 2017 08:38:40 +0000 (08:38 +0000)
commit8896df965b1ff07d695efb5598acab3ef40b0cef
treeca3176fe69cbe0747bfc7cd7cf914857882416bd
parent91f5a632626f3f991a40ff9a5c3d6751836c604d
parent6203bde8d3ffe78201afaa3fa97893a0115d995c
Merge "Index the System status page" into oc-mr1-dev
am: 6203bde8d3

Change-Id: If4350a9cb90e995aa5095c77570055e464103879
res/xml/device_info_status.xml
src/com/android/settings/deviceinfo/Status.java