tree 7e3b0778abacfe37d468cfd01c71b8077f5dbc0d
parent 3fd4dfeb9bdc6eb9e7bcc60a65903a229bcc0a40
parent a06f8612e35312a274970d0fd5d144c452a1c32d
author The Android Open Source Project <initial-contribution@android.com> 1370293471 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1370293471 -0700

Reconcile with jb-mr2-release - do not merge

Change-Id: I5a911c726db73fdb606d929fbd9bc83aa36c5c6c