| commit | bb6d1facef2d04798dc10ad5146bb4383e5259ca | [log] [tgz] |
|---|---|---|
| author | Dan Austin <danielaustin@google.com> | Tue Sep 15 13:43:03 2015 -0700 |
| committer | Dan Austin <danielaustin@google.com> | Tue Sep 15 13:43:03 2015 -0700 |
| tree | 0251386adf9ae4081cc5e08876a0cf85f5af0582 | |
| parent | 0f97cc30663d3a4f636463124c04763c509eab40 [diff] | |
| parent | 85dc1577c22d0045513d7adbce77964a61b43367 [diff] |
resolved conflicts for 85dc1577 to stage-aosp-master Change-Id: If4b17fec174a920866a3d56c39db983ccb665679