tree b19e65a133a1cb026e993d854f961166288aa8eb
parent 4a243a589841db65b8b9d5b5398f7eab506a825a
parent 59eb0c65fa6255af8b38c83f593fdf6a3a445eba
author The Android Open Source Project <initial-contribution@android.com> 1348162634 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1348162634 -0700

Reconcile with jb-mr1-release - do not merge

Change-Id: Ib5ce9a829c2afde6f7d727c056c24386c6d639fd