OSDN Git Service

Merge "Allow manual to be read from disk" into mnc-dr-dev
authorZach Kuznia <zork@google.com>
Thu, 1 Oct 2015 00:08:05 +0000 (00:08 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 1 Oct 2015 00:08:05 +0000 (00:08 +0000)
commitae8aea76e5cbef1eefde401f8622d05275156cf7
tree3a732a352c2377d48347e23411b844599b05519b
parent1207a50100bbb3aaa55fc6394e13ad18fc019f8e
parent5adcb3d353b066a056b86ae66946a06a251ff1fb
Merge "Allow manual to be read from disk" into mnc-dr-dev
AndroidManifest.xml
res/values/bools.xml
res/values/strings.xml
src/com/android/settings/DeviceInfoSettings.java