OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 00fd3b3 d296b16)
am d296b167: am 8b6b92ea: (-s ours) am 49000016: am 8d8e669e: Merge "DO NOT MERGE...
authorDanielle Millett <dmillett@google.com>
Tue, 15 Nov 2011 21:13:58 +0000 (13:13 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 15 Nov 2011 21:13:58 +0000 (13:13 -0800)
* commit 'd296b167629fcdcdfbcb6ac105900085ae6e59f4':
  DO NOT MERGE cherry picking from MR0 cl 148223


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