tree 69d7fe945af6de3bf046f20e389119fe3531a0c1
parent ddf62a13a066039782e4cb67c256b1489c46ed1f
parent 51a95096f752f772e509e0fbe2195026fb5e4872
author The Android Open Source Project <initial-contribution@android.com> 1347460921 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1347460921 -0700

Reconcile with jb-mr1-release - do not merge

Change-Id: I75192a980be37fe14baa5ee2cd5a69452c161b5e