tree a1bb7cd3a3b0add994e4ba603ade2142cc7e6ba9
parent 447f8e86adb7c6e5dc91ac7ff4667d30ee8d82f5
parent e37fa97752cb0e8b79b94f1c1745894b40b7d57e
author The Android Open Source Project <initial-contribution@android.com> 1349887867 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349887867 -0700

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

* commit 'e37fa97752cb0e8b79b94f1c1745894b40b7d57e':