OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@google.com>
Wed, 23 Apr 2014 12:49:26 +0000 (05:49 -0700)
committerThe Android Automerger <android-build@google.com>
Wed, 23 Apr 2014 12:49:26 +0000 (05:49 -0700)
commitd2ff1fd328658dc656ed98ab5f72bc52b939c180
treee675c31723e63b567c8b1ba4ebdde1abc54e6a8f
parent6292ad5796c6cc740b29223f8c4225056d377883
parent1ae52afd3c473eac84f2502efc97795608d710f9
merge in master-release history after reset to master