OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@google.com>
Sat, 5 Apr 2014 12:49:28 +0000 (05:49 -0700)
committerThe Android Automerger <android-build@google.com>
Sat, 5 Apr 2014 12:49:28 +0000 (05:49 -0700)
commit7bfea3546d618003d2bb9ca30b8407d0196a7882
treed89bc14917d9f7be85269e2355182e9cd3feaf35
parentb29d44e619b2f588a931b7a09f22caf867d5d9a2
parent019a85225412fd101bd054e9f815f358adf22b6c
merge in master-release history after reset to master