]> git.saurik.com Git - android/aapt.git/commitdiff
projects / android / aapt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bb02e32 d435a6e)
am 48ba4139: (-s ours) am fe9a2a54: (-s ours) Cherry-pick f51125d from master to...
authorRaphael <raphael@google.com>
Fri, 28 Oct 2011 22:27:22 +0000 (22:27 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 28 Oct 2011 22:27:22 +0000 (22:27 +0000)
* commit '48ba4139b9dc1f53f996b71f509a9d0c6fd2d72b':
  Cherry-pick f51125d from master to ics-mr0. do not merge.


Trivial merge
mirror of aapt