tree 04a192c984360f002f74c8be947a50bd304b3c99
parent 8d2794be0c65f93f19632e811343aab56bb51242
parent f6f6cfc17f89350f37cee1549533778ade226437
author The Android Open Source Project <initial-contribution@android.com> 1343945355 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1343945355 -0700

am f6f6cfc1: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'f6f6cfc17f89350f37cee1549533778ade226437':