tree 2bc0c2aec0a628a79fce0f088ede1d0a5d3bc92b
parent d9596bbb71d6633a80315986bcdc117487d14c29
parent 3ec371f442c44ce0c7707145619969f3c92a48af
author The Android Open Source Project <initial-contribution@android.com> 1366047990 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1366047990 -0700

Reconcile with jb-mr2-release - do not merge

Change-Id: I0efd5b7abf85eef483d78230de4411f330c2f4f6