OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@android.com>
Tue, 7 May 2013 14:49:36 +0000 (07:49 -0700)
committerThe Android Automerger <android-build@android.com>
Tue, 7 May 2013 14:49:36 +0000 (07:49 -0700)
commit6f9707411921c72255dfa8b6ba26e7758de10ef6
tree654ca045b2a790b3ad24577297655168909ce705
parent98b50774ae036698bd3c34324ffacd6bfd2144c2
parent01ea19039c9a092e3653dde442068e755ccdac9d
merge in master-release history after reset to master