OSDN Git Service

merge in master-release history after reset to 498692535c7ceecb3434a99c47e4c90ba3fdd90e
authorThe Android Automerger <android-build@google.com>
Wed, 21 May 2014 12:50:02 +0000 (05:50 -0700)
committerThe Android Automerger <android-build@google.com>
Wed, 21 May 2014 12:50:02 +0000 (05:50 -0700)
commit20f6c52df39f9b23b9edd7b4097ab73bb4b939d8
tree6b6efb3be5a6c6c11647a87888e9d88fcaf813f9
parent498692535c7ceecb3434a99c47e4c90ba3fdd90e
parent0516981306859421bdd49ac4a8aefbc654451f5e
merge in master-release history after reset to 498692535c7ceecb3434a99c47e4c90ba3fdd90e