tree adfa8dcf5c4baa229f9a0d8beccce3c49853372a
parent d9b11c3a7bdffa02bf7e2bd84f291c9c7418c884
parent e63e2c8458094286eae151b89770a4f946631726
author The Android Open Source Project <initial-contribution@android.com> 1354033303 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1354033303 -0800

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

Change-Id: I30d8a859ae8573bd3892bf1f7e400b4b1bb3476e