| commit | 5c53fdb89367481c2a65d7c8d188415c8e485131 | [log] [tgz] |
|---|---|---|
| author | Alex Klyubin <klyubin@google.com> | Thu Dec 22 10:20:23 2016 -0800 |
| committer | Alex Klyubin <klyubin@google.com> | Thu Dec 22 10:20:23 2016 -0800 |
| tree | fc8a404cf10efd5998b58dd0d0e47b06b0fe2954 | |
| parent | a3943850ab67dc2df1639202de6735c3991e4dc8 [diff] | |
| parent | febd982cdd61ecad34c4d463fb63d2a4836d26ea [diff] |
resolve merge conflicts of febd982 to stage-aosp-master Change-Id: I40c27e3159b8f7acd60c6fa42509bb23d146b937