| commit | f120cf3d886753b4ae28bda48b1d2b10b754798c | [log] [tgz] |
|---|---|---|
| author | Jason Monk <jmonk@google.com> | Tue Dec 06 11:34:12 2016 -0500 |
| committer | Jason Monk <jmonk@google.com> | Tue Dec 06 11:34:12 2016 -0500 |
| tree | 309c0d0c58cc1bf3d6a5745bf51f5e8ce199e677 | |
| parent | 1abe6def681cfefd9120fe5ca9c2a65dc5cefb60 [diff] | |
| parent | 9600df035b9994ae481dd7ce0335241b752f7034 [diff] |
resolve merge conflicts of 9600df0 to stage-aosp-master Change-Id: I139c64bb2440d64312d7e763e53bdb13dcb9f1aa