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


Trivial merge
mirror of aapt