| commit | 4cca8a5573fc3463011c1d937bf27d3f756fcbf9 | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Fri Jul 15 14:49:45 2016 -0700 |
| committer | Colin Cross <ccross@android.com> | Fri Jul 15 14:49:45 2016 -0700 |
| tree | fa7c573dbe153c636d105293a7184cdba22bd210 | |
| parent | 59c0529d6d0e68d1b267dcea6ab470fbf29774f3 [diff] | |
| parent | 1e92cfb9a0a23f54413825d663d004d36008e34e [diff] |
resolve merge conflicts of 1e92cfb to stage-aosp-master Change-Id: I1929d5c16ea0b8574372049ac7dffd30fd3e1db3