OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@google.com>
Sun, 6 Apr 2014 12:49:10 +0000 (05:49 -0700)
committerThe Android Automerger <android-build@google.com>
Sun, 6 Apr 2014 12:49:10 +0000 (05:49 -0700)
commit04e3b41b27ced3353421e2a33d1b50aafc701204
treed89bc14917d9f7be85269e2355182e9cd3feaf35
parentb29d44e619b2f588a931b7a09f22caf867d5d9a2
parent3ba4ac60b75171e6c93609ef80caaafed8812ffb
merge in master-release history after reset to master