tree a2ac3429cedaa9da6f974b0d11c31c852b81ff95
parent e8a5711ba90424af83d18e0666ac53595f03abb4
parent a9d5c8259176af09e0d27d8941a5832069f862fc
author The Android Open Source Project <initial-contribution@android.com> 1366048395 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1366048395 -0700

am a9d5c825: Reconcile with jb-mr2-release - do not merge

* commit 'a9d5c8259176af09e0d27d8941a5832069f862fc':