tree aa576fa8a8f3c6702a8104ecc8dca3b5ff43ad12
parent bbbf505c1d91ebb7a9923be904abd3f9d689f875
parent 3f3788c339488d106830718174341380ddd5193a
author The Android Open Source Project <initial-contribution@android.com> 1385177467 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1385177467 -0800

am 3f3788c3: am f00c938c: Merge commit \'811b0cdb2d6e4a697dbc63a678712759dd0db242\' into HEAD

* commit '3f3788c339488d106830718174341380ddd5193a':