tree 6fd0a882951c48ec8d21b63db5b5442b11748376
parent 2bf04328e721f2cddaa63ae765788dab6f29250f
parent 1b8813d1819b536428c9da494f4fca7bfd68e7a2
author The Android Open Source Project <initial-contribution@android.com> 1363797165 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1363797165 -0700

Reconcile with jb-mr2-release - do not merge

Change-Id: I3c7bd1f8cb10abd5fe288ad8a40c0db87f18dfb0