tree fbb123bc21fa69026c0d4ed4f4bb426fd3e71f0a
parent 81972daf3323a130ca06c9999a3a8530e33fece9
parent a01f72dea582935bf4a4e83767d3c93f233323d8
author The Android Open Source Project <initial-contribution@android.com> 1369063218 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1369063218 -0700

Reconcile with jb-mr2-release - do not merge

Change-Id: I35dd28838537b7d96b26cf3731e7391af23b4b86