tree 67b49a58e7ed9f8f2ce3cffeeaedc5fe6667eca6
parent d74b3bb1cb1d0f0f710d86112209008d6bea51c7
parent fd59d4d3eaccb9b181f8a2b9c88ffe5060f1e528
author The Android Open Source Project <initial-contribution@android.com> 1364325460 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1364325460 -0700

am fd59d4d3: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit 'fd59d4d3eaccb9b181f8a2b9c88ffe5060f1e528':