OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@google.com>
Sat, 8 Mar 2014 13:50:51 +0000 (05:50 -0800)
committerThe Android Automerger <android-build@google.com>
Sat, 8 Mar 2014 13:50:51 +0000 (05:50 -0800)
commit03ce3de81efd6f98b89e7a596b8f1c00e9499d9a
tree36477ef67df3d0d992237c22eaf889102944d510
parentccdebacf6a4311435f3048e7217c1b1532c3de73
parentd3daad16dccc5f081d0ce2d6b8ad9604f873aecf
merge in master-release history after reset to master