tree 593f5b9753bf9dd35828609042ac619d3f3bfd8d
parent 851b40325449e9a0fabd2f9667f707860b94d51e
parent 49e44d8dfe9c9c2fd759c6ebb10018152f596c2e
author The Android Open Source Project <initial-contribution@android.com> 1360100694 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1360100694 -0800

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

Change-Id: I37667f21ee86fe7aafbf7f44573b27d7eb573f7e