| commit | 5b2880ad91162feb778f3b7c96b5e1c76f382086 | [log] [tgz] |
|---|---|---|
| author | Brad Ebinger <breadley@google.com> | Thu Oct 27 11:19:35 2016 -0700 |
| committer | Brad Ebinger <breadley@google.com> | Thu Oct 27 13:48:46 2016 -0700 |
| tree | b961a30780cea3137ccbe282e68f9cd255efaa6b | |
| parent | 6b270d41caf79ba0feaac7b5f1b56fde51af1639 [diff] | |
| parent | d1b36695f77189f008e2de82b4391e5e49048c18 [diff] |
resolve merge conflicts of d1b3669 to stage-aosp-master Change-Id: I5c771d7edf789ef8c70c9c0eb86243d8bc4a7549