tree f584de3bd3a6cc4c7f0ce5c89ca245436945141e
parent 0245c34cfcc3ba8d5ef30bc89cd369181ab5ee22
parent 379c1aec119acef172452b17dca481cedb86ba0f
author The Android Open Source Project <initial-contribution@android.com> 1386293208 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1386293208 -0800

am 379c1aec: Merge commit \'aad56dda40dca1d9b6418ef48f12257101b2c7b2\' into HEAD

* commit '379c1aec119acef172452b17dca481cedb86ba0f':