OSDN Git Service

merge in master-release history after reset to 77a3374a6170fb5f0168169bc4bc3fa9baf318eb
authorThe Android Automerger <android-build@google.com>
Thu, 22 May 2014 14:21:54 +0000 (07:21 -0700)
committerThe Android Automerger <android-build@google.com>
Thu, 22 May 2014 14:21:54 +0000 (07:21 -0700)
commit24adc0400381612a97e8b30d83484f4107819d5c
tree38f2b63b0d112722cde2914676cfaeee66f0d52f
parent77a3374a6170fb5f0168169bc4bc3fa9baf318eb
parent397e63240e5d52a07dea5ad376b94386e7a00388
merge in master-release history after reset to 77a3374a6170fb5f0168169bc4bc3fa9baf318eb