tree 30c6b888f0be22304740d05aea1c9f2f1abad0ea
parent 9fdf3868aa4f1fdc7295759e24a0c7498ee98c60
parent 65e6966389ca535cb0aaadeb7316600cf53bdef1
author The Android Open Source Project <initial-contribution@android.com> 1365613556 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1365613556 -0700

Reconcile with jb-mr2-release - do not merge

Change-Id: Ic2d8fb42f01f3d9ffeeffd2b0a02bc3ddbad2ed7