tree 886e43ddd1e8d50cf1476a252fc31458b8aaf7f8
parent 8f7ac8caa62326d28a50c9aeb037a805eda661f1
parent 0c3379a819085790a319cf0abcd0d663a2573892
author The Android Open Source Project <initial-contribution@android.com> 1356105568 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1356105568 -0800

Reconcile with jb-mr1.1-release - do not merge

Change-Id: Ic86ea3815748a11695d10b369d957ebdf647ab57