OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@google.com>
Sat, 12 Apr 2014 12:52:10 +0000 (05:52 -0700)
committerThe Android Automerger <android-build@google.com>
Sat, 12 Apr 2014 12:52:10 +0000 (05:52 -0700)
commit5c777b121c8da90faa5efba7fc89f90ada354494
tree970981f8e891b2a2a5e6cb95a42dc774476ace99
parent210bb8694aa5ad14b2b5bd52ab77a7960b4b5712
parentbc36520095ee1466098f224990d89d48b5c95d39
merge in master-release history after reset to master