tree 1d51f0608f26a366069c144f55860f80d2888b59
parent b402cab34d25a7225799a2e417e0ab660f67d7bf
parent 29e8f29a1333526609384dcfa9ee7be4295227f3
author The Android Open Source Project <initial-contribution@android.com> 1354033297 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1354033297 -0800

Merge jb-mr1-dev into aosp/master - do not merge

Change-Id: Iddcd90193ed419eef8e4c63bd37fd778d5bbd4f0