OSDN Git Service

Merge "resolved conflicts for merge of 6edef668 to master"
authorJorim Jaggi <jjaggi@google.com>
Thu, 12 Jun 2014 20:03:56 +0000 (20:03 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 11 Jun 2014 15:57:38 +0000 (15:57 +0000)
commita1adf0db4f69607a9daa9c7ced6dd4d32c44168c
tree5f0a06f2e2850810fef7914c575c312427d6dc25
parent9c1b8af720e952a174c86b961150b173071e05f0
parentb41e0e37ecb59eec14d09068d1d6ac953eea59ce
Merge "resolved conflicts for merge of 6edef668 to master"