| commit | 98da13bbd2db4b2247b90d83deec5e8befbee536 | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Mon Sep 28 16:41:45 2015 -0700 |
| committer | Colin Cross <ccross@android.com> | Mon Sep 28 16:41:45 2015 -0700 |
| tree | e6e616659bcfc5f6daa5400e9bd5497e3ea7b2b6 | |
| parent | e06e961cc69b48e562f42464d4db0adc2b8d81d9 [diff] | |
| parent | 6c3bf1b800d8b7514731cbb169b1070e172a1148 [diff] |
resolved conflicts for 6c3bf1b8 to stage-aosp-master Change-Id: If93ed1d9229f7fbe750f85ea4b3c3e4fce5dbb29