tree bcea63abdadb287d0864fdd8c3f41106f4b28d41
parent 4ddc88e73e43b98589bc14739acfb2428c5f9cc3
parent 4ef824e9481625270aa065cc4d0625e8c8d9e0df
author Jean-Baptiste Queru <jbq@google.com> 1319816584 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1319816584 +0000

am 4ef824e9: am 71619f13: am 604f52e3: Reconcile with AOSP master

* commit '4ef824e9481625270aa065cc4d0625e8c8d9e0df':