OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e3be79b 783e115)
resolved conflicts for merge of 783e115b to jb-mr1-dev
authorScott Main <smain@google.com>
Thu, 15 Nov 2012 03:10:18 +0000 (19:10 -0800)
committerScott Main <smain@google.com>
Thu, 15 Nov 2012 03:10:18 +0000 (19:10 -0800)
Change-Id: Ibfd3023a845fb6cc549f05bcff2d6e4abc7e5a07


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help