OSDN Git Service

Merge "resolved conflicts for merge of f8272896 to master"
authorElliott Hughes <enh@google.com>
Thu, 5 Jun 2014 18:40:49 +0000 (18:40 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 5 Jun 2014 18:40:50 +0000 (18:40 +0000)
commit406be84ed3cbeac84f7c3de77090f3606e48d593
tree111a548357f166e9555f68052bcd379095bd6262
parent561d5aa8ac163414456c7449d95d535374a2e39f
parent2432912b356dfafd72f8be7b45286a9bc979029e
Merge "resolved conflicts for merge of f8272896 to master"