tree 958a98ebfdad6010e04b54258e2399984f768a2b
parent 3274d23504c27832f5ac37d75fe3896781c372bf
parent f690341bbb757c578019cd95461881ccb680f794
author The Android Open Source Project <initial-contribution@android.com> 1360100778 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1360100778 -0800

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

Change-Id: I40e21d1cdb873a8ef0701dccfba9555154d2e901