tree 09b93388c4ea0bfaf87e41128f4fac238e02773f
parent fbcfad33face5d3b9e6b8cb04379168bceb517df
parent 166565f9fb3034f7e7f60f6614cff754d94a4078
author The Android Open Source Project <initial-contribution@android.com> 1373556140 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1373556140 -0700

Reconcile with jb-mr2-release - do not merge

Change-Id: Id35004f465f5152c1de0796eb66989f234185208