OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 821a90d c0dbd25)
resolved conflicts for merge of c0dbd255 to master
authorMichael Wright <michaelwr@google.com>
Tue, 30 Jul 2013 02:37:32 +0000 (19:37 -0700)
committerMichael Wright <michaelwr@google.com>
Tue, 30 Jul 2013 02:37:32 +0000 (19:37 -0700)
Change-Id: I0bc9bb711bae95526921771c9390065631f99c31


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