tree 876d15d7620f7bb6c7b598d868ee019ee19f92b4
parent 1dad12978071e59c0a94034d973855729b8b6f54
parent 5a2f2bf0bddf832fccd61b688e182e8e89a953a8
author The Android Open Source Project <initial-contribution@android.com> 1360100983 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1360100983 -0800

Reconcile with jb-mr1.1-release - do not merge

Change-Id: I3dfd8ee0a7c0013cd1bb0d39f6fbd745677f5d90