OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@google.com>
Wed, 5 Mar 2014 16:04:45 +0000 (08:04 -0800)
committerThe Android Automerger <android-build@google.com>
Wed, 5 Mar 2014 16:04:45 +0000 (08:04 -0800)
commita39362de4ffd9bc897b472992839760bdd7f0aba
treeae68b260f38d8b7edd70c475039275823bc5b073
parent636bcf0f699c8f6bbdfed29a9dcad8c3bc213149
parentc6ff1951afa2ac43a1bcd8baf43ca2c61be903dd
merge in master-release history after reset to master