tree 561ccc2f85b1b6f91a556d651fe6d5320d3ef3db
parent 261f332a9cbadcda5d64c00db9bb8fff76c70f8f
parent a38a7707a5187cf9566c88c372b8c1fa1cb43725
author The Android Open Source Project <initial-contribution@android.com> 1386640717 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1386640717 +0000

am a38a7707: (-s ours) am f7ec27e1: Merge commit \'1940731af14148e5a80066fe0ff471f40b9182a5\' into HEAD

* commit 'a38a7707a5187cf9566c88c372b8c1fa1cb43725':