tree fc6ad753a7beab94b4a01a2f14a1754cb814c18d
parent 8e1b4f65383d859ca7e2ebfc9a9463c8d46271de
parent 46f961baabcfb3bd73ed5b4cf2ec7cf8e642ab1c
parent 1f1d755ada0bc7d33c8c7226fe730d05d6a53acc
author The Android Open Source Project <initial-contribution@android.com> 1343425973 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1343425974 -0700

Reconcile with jb-mr0-release jb-release

Change-Id: I3742aff353335629ae76eacc2d92a6aed87b1ebe