| commit | d16f3be4c8e27cc2ecffc241adcddfe9d62acba3 | [log] [tgz] |
|---|---|---|
| author | ztenghui <ztenghui@google.com> | Mon Jun 16 18:04:10 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Sat Jun 14 02:21:10 2014 +0000 |
| tree | 0667e2fb94d1997986616555739532e629fb1b27 | |
| parent | c25c727937734534e022d06d73de01ab0a65ff39 [diff] | |
| parent | 2357d72ce2427c7b91f8c23487f0d49590e78ea6 [diff] |
Merge "resolved conflicts for merge of ecae1ffd to master"