]> git.saurik.com Git - android/aapt.git/commit
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)
commitd205df67d395fad69fc0d9b43399b0dd51daa14f
tree0873960a8c28dfb794a087659ee5ac918eb3363e
parentbb02e3288ea08f3e55fc7b5ea824264188a3c136
parentd435a6e02ab27cc230971edc40d52e791e678c26
am 48ba4139: (-s ours) am fe9a2a54: (-s ours) Cherry-pick f51125d from master to ics-mr0. do not merge.

* commit '48ba4139b9dc1f53f996b71f509a9d0c6fd2d72b':
  Cherry-pick f51125d from master to ics-mr0. do not merge.