| commit | e151fc6eb9c7c166cecccdedae007c7e405655fc | [log] [tgz] |
|---|---|---|
| author | Pavel Zhamaitsiak <pavelz@google.com> | Wed Jan 13 00:09:05 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Jan 13 00:09:05 2016 +0000 |
| tree | fc5199494cc39a432ce292ed77efd0594dbaed2f | |
| parent | 6bb73856ee6d632cdaab5af6c3108770545b89cf [diff] | |
| parent | cef504f9142db0b92b34578e22c689ef53135210 [diff] |
Merge "resolve merge conflicts of 68514d5325 to master."