tree 640f655cd595f82ace4684488b369de235fb5ac8
parent 546bdab37dd2570cc1f4f5ecc89779ac4f6346d0
parent b7c7b51c85554174ee64499399e28db27eb2c6ff
author The Android Open Source Project <initial-contribution@android.com> 1349274859 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1349274859 -0700

Reconcile with jb-mr1-release - do not merge

Change-Id: I029549918f3f7236eb5e058372221167d8618a70