OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 57217ae 8e18934)
resolve merge conflicts of 8e18934478 to master.
authorJason Monk <jmonk@google.com>
Tue, 20 Oct 2015 21:29:43 +0000 (14:29 -0700)
committerJason Monk <jmonk@google.com>
Tue, 20 Oct 2015 21:29:43 +0000 (14:29 -0700)
commit30e0a4a48aada7e0a9bce7dcbf65d31c039dfe51
tree88dfd9cf1836d49e6f7a5aa548aeecaa20bf9cf8tree | snapshot
parent57217ae00a69c1a6359c634881934064a0b3564fcommit | diff
parent8e18934478f386578b3901680626ef8a8953b39bcommit | diff
resolve merge conflicts of 8e18934478 to master.

Change-Id: I07300436383f8f67cb1d85e6f06f2b2ca3a27534
src/com/android/settings/deviceinfo/Status.java diff1 | diff2 | blob | history
packages/apps/Settings
About OSDN
Find Software
Develop Software
Help