tree af5d35ea70f2aa6d60b49c51effc816fe2a66760
parent 374d39968a0b2516f75a9f2815b28f1de5ff4775
parent be3c59b806e17020b7ca2034b46b243116826118
author The Android Open Source Project <initial-contribution@android.com> 1348162602 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1348162602 -0700

Reconcile with jb-mr1-release - do not merge

Change-Id: If5926763f15cb33557ca2550360a205beb9a86f2