commit | a1adf0db4f69607a9daa9c7ced6dd4d32c44168c | [log] [tgz] |
---|---|---|
author | Jorim Jaggi <jjaggi@google.com> | Thu Jun 12 20:03:56 2014 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Jun 11 15:57:38 2014 +0000 |
tree | 5f0a06f2e2850810fef7914c575c312427d6dc25 | |
parent | 9c1b8af720e952a174c86b961150b173071e05f0 [diff] | |
parent | b41e0e37ecb59eec14d09068d1d6ac953eea59ce [diff] |
Merge "resolved conflicts for merge of 6edef668 to master"