OSDN Git Service

Merge "resolved conflicts for merge of 069d7e9b to master"
authorAmith Yamasani <yamasani@google.com>
Fri, 10 May 2013 00:08:25 +0000 (00:08 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 10 May 2013 00:08:25 +0000 (00:08 +0000)
commit980c49d3077a7bbb9f3bed0eadc61ca8d451a7ef
treea90c5aec74d9276e37e36ef1358f1ec81cc8f50b
parent1519882f524579a30e9569c7f0def32193b45591
parentecd5afe1ef4aa2a5d11ad4fa356fb6d5f461efb4
Merge "resolved conflicts for merge of 069d7e9b to master"