tree 3265f3735ccf546ff80e021c0e16ffc6a1670110
parent 94fc236d199460bddc390ce7f384b446c14df622
parent 17f1fe1a960db78c84aaa753c784a4df513a1d3d
author The Android Open Source Project <initial-contribution@android.com> 1352233811 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1352233811 -0800

am 17f1fe1a: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit '17f1fe1a960db78c84aaa753c784a4df513a1d3d':