tree e23ac7508f7b595a7f700d8f635c2acbc0c3b865
parent 01c221b40d9133bc1fd7f045de3dbfcc25dcfea7
parent 4369a0dcc26b6298a4bba44a732b6f270a593f79
author The Android Open Source Project <initial-contribution@android.com> 1349274992 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349274992 -0700

am 4369a0dc: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '4369a0dcc26b6298a4bba44a732b6f270a593f79':