OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 11 Apr 2013 14:44:59 +0000 (07:44 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 11 Apr 2013 14:44:59 +0000 (07:44 -0700)
commitc1213473de0890856341bed09ef08b14603ddb30
tree42ba18128a970a24f1c6fac9204e68de58c29f5b
parentc9bdff96ca4270cc6f626298b05e13f92ad00551
parent3099d895c955bb25f1c3345afaa71df18f3ea3db
Reconcile with jb-mr2-release - do not merge

Change-Id: I55884a9acd85fee2a3b45f5262b074731ca9ea16