tree 621781796dbbce452a5bad242593ce24cb4aaf00
parent 42732e1037b48e9bf71e9965bc28ddb5d8242fa4
parent d39de0b042d76662cc05b27c81a9f5a71c4d01fd
author The Android Open Source Project <initial-contribution@android.com> 1366047966 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1366047967 -0700

Reconcile with jb-mr2-release - do not merge

Change-Id: I618d51505419200bc282404ec2af470be97f1fa7