tree 002d988df2fad38eb207090e0cfcde03efcac6b5
parent 71507e9b627f1607e3b9218439212c3571cff989
parent c27010430d1e9dc54d2d007fa8de7636373ba4f7
author The Android Open Source Project <initial-contribution@android.com> 1349274787 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1349274787 -0700

Reconcile with jb-mr1-release - do not merge

Change-Id: Ice6704d7d776ae5efb5ec251fe9809054807c119