| commit | 6047c24faea772eabe2eaad96087290f47720c75 | [log] [tgz] |
|---|---|---|
| author | Tao Bao <tbao@google.com> | Tue Jun 21 13:35:26 2016 -0700 |
| committer | Tao Bao <tbao@google.com> | Tue Jun 21 13:37:26 2016 -0700 |
| tree | 8ff8ce2dc85c8be43647e1bd7125e33d735ca3c8 | |
| parent | 1a866dc2178c70f1eddc4047453b980b9f546fd8 [diff] | |
| parent | 9cbe37e723ca8845b8f9707571c6b75a18845431 [diff] |
resolve merge conflicts of 9cbe37e to nyc-mr1-dev-plus-aosp Change-Id: I9643386f714fe520e5732d0e6dbe821131ea6d02