tree 5cdd1100ee0858ad6f9fb08c0b7f3422022a4204
parent bad30c146695e7198bf451a09dacc462464c94bf
parent 93333d9704fb320a85fe752f649e78502d4ce3e2
author The Android Open Source Project <initial-contribution@android.com> 1348765142 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1348765142 -0700

Reconcile with jb-mr1-release - do not merge

Change-Id: I506a8d1b8014f03b954338c90a3f986a457d65bd