tree 42a0d1146540bb086c638f6b6e1fd72809d6e7e4
parent 3fae8d4e5685e604cc1dcc3c72745d6b521cfdc1
parent bdd2ce0061363c9f438ef0c2ec51115dac138577
parent 516c242b31f81c2308a868323f87c0da5ce16756
author The Android Open Source Project <initial-contribution@android.com> 1342712148 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1342712148 -0700

Reconcile with jb-mr0-release jb-release

Change-Id: Id8ba9e1858f97ba17d9f9b9080c0e18c0bebfa7b