OSDN Git Service

merge in master-release history after reset to b0a78117420f2191ff51255a8e283138af56839b
authorThe Android Automerger <android-build@google.com>
Sat, 26 Apr 2014 12:51:46 +0000 (05:51 -0700)
committerThe Android Automerger <android-build@google.com>
Sat, 26 Apr 2014 12:51:46 +0000 (05:51 -0700)
commit2c96bd5fdc1af1977083b57b93034f8a2436da4c
tree4b8f1edbd1acfcd89797ec2b995c5d77e648cee0
parentb0a78117420f2191ff51255a8e283138af56839b
parent3e78ce795611a28fe9269c6a2a182b97946993c9
merge in master-release history after reset to b0a78117420f2191ff51255a8e283138af56839b