tree 9e83ffc40b216a91615b5dcc1bce14fec373f24a
parent 37ce0b53c80436275fb2c18c26739abe21759852
parent 47a86260ee28668f96154b509a6a3bd16b08f69e
author Xavier Ducrohet <xav@android.com> 1329435470 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1329435470 -0800

am 47a86260: (-s ours) am 95605614: am fd9cdb46: Increase platform sdk package revision. do not merge.

* commit '47a86260ee28668f96154b509a6a3bd16b08f69e':