OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@google.com>
Tue, 4 Mar 2014 13:49:18 +0000 (05:49 -0800)
committerThe Android Automerger <android-build@google.com>
Tue, 4 Mar 2014 13:49:18 +0000 (05:49 -0800)
commitc6ff1951afa2ac43a1bcd8baf43ca2c61be903dd
treed6ed7ec51287bc7677986097f78a54d2bd21f48b
parent010d0902411fef734d580ff7ab86ce816b05cbe9
parenteb25e220bc7a33203c78b1ab92c1f4ebed6a56cd
merge in master-release history after reset to master