tree d322c90ebf252699e402419308d503689cfbf77f
parent 48af42228af50677d3f083d2e3e0513b4b11355d
parent b08d95e4f4b727a8bcf49db8a2198c18ee0c6919
author The Android Open Source Project <initial-contribution@android.com> 1366047958 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1366047958 -0700

Reconcile with jb-mr2-release - do not merge

Change-Id: I9c2c56c767d1ba2873e7eddbb4fe14793bdb8ae8