| commit | fa476445582a03341529be4d6bab07acb965747c | [log] [tgz] |
|---|---|---|
| author | Ben Kwa <kenobi@google.com> | Thu Jun 11 01:26:42 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jun 11 01:26:44 2015 +0000 |
| tree | e447e25bb3afdafe14fe4a53f6e89c67289de2fb | |
| parent | 5a0308e14ad3a00cf68c25227a7abcfc702ba227 [diff] | |
| parent | 435efbd2f5e181edfe50a38dd4a643fb37de7c34 [diff] |
Merge "resolved conflicts for merge of 3aff4fc6 to master"