| commit | 6dcda02e4c51fc882742debdc70f03b360c7dc86 | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Mon Sep 28 19:25:15 2015 -0700 |
| committer | Colin Cross <ccross@android.com> | Mon Sep 28 19:25:15 2015 -0700 |
| tree | a14b6df2e5e62be98754b7dbfbe732b58123226b | |
| parent | 00b3248839205674b692a7464bd6df5777b81e83 [diff] | |
| parent | 5acaa9dca07141f8123858fc76ce850b4dbbc813 [diff] |
resolved conflicts for 5acaa9dc to master Change-Id: Idbadd1127e9524b6ecb571cdc7338d106ca2be3f