OSDN Git Service

(root) / android-x86 / packages-apps-Trebuchet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fbd14ac 64a3cbf)
am 64a3cbf8: (-s ours) am f44abc8e: am 6b32fc9b: Merge "DO NOT MERGE temp fix for...
authorMichael Jurka <mikejurka@google.com>
Thu, 9 Jun 2011 20:32:30 +0000 (13:32 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 9 Jun 2011 20:32:30 +0000 (13:32 -0700)
* commit '64a3cbf864785d3817e1f698505790426fc5b0b7':
  DO NOT MERGE temp fix for NPE


Trivial merge
packages/apps/Trebuchet
About OSDN
Find Software
Develop Software
Help