OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2e30d77 2df4b6a)
am 2df4b6a0: am 2facefe6: am 00d115a7: resolved conflicts for merge of aa737c49 to...
authorBrian Carlstrom <bdc@google.com>
Fri, 14 Mar 2014 13:21:28 +0000 (06:21 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 14 Mar 2014 13:21:28 +0000 (06:21 -0700)
* commit '2df4b6a050452c48a31a9543e63388d4fc2433ba':
  DO NOT MERGE - Remove data dirs if a new install fails dexopt.


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