| commit | 86dbc0d62126868368b35a6127a7317248925247 | [log] [tgz] |
|---|---|---|
| author | Dan Austin <danielaustin@google.com> | Tue Sep 15 14:08:28 2015 -0700 |
| committer | Dan Austin <danielaustin@google.com> | Tue Sep 15 14:08:28 2015 -0700 |
| tree | 34d9c90ca51863de596016a51919be49aff8ca41 | |
| parent | bb6d1facef2d04798dc10ad5146bb4383e5259ca [diff] | |
| parent | fd86dd2d92def2577142abb2ed60a7efa1fc4362 [diff] |
resolved conflicts for fd86dd2d to stage-aosp-master Change-Id: I0428b0655d49295ed09e21d62d41851f76a76c26