tree 1563f0a1eecf534ca2370b8a8e46a713cc48370c
parent a5ba888d8746c84ba509d074fa3cd7d006e7c803
parent ad6517496e738508d572df4e26c683744f2fda9c
author The Android Open Source Project <initial-contribution@android.com> 1354033277 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1354033277 -0800

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

Change-Id: I1bc3bdb524dffa351664c756742e1bbdc622a8b7