OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 4 Mar 2013 19:06:56 +0000 (11:06 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 4 Mar 2013 19:06:56 +0000 (11:06 -0800)
commitd59ea7abc25970a8242b795426e830be42c824cd
tree5a36f08d1aadf4a189517f5ddb675b1514374e9a
parentf30f25ca878ddcb6d78184ff17553c3714cdd13b
parent07d87e2d057c6aad7626987f5df7c25be1fc185f
Reconcile with jb-mr2-release - do not merge

Change-Id: I33a0b7686aaf8e8a10c3ec222b673297ad7e76a1