| commit | b15623cf1c63d33fdd60c6046312c88cda961eb6 | [log] [tgz] |
|---|---|---|
| author | Casey Dahlin <sadmac@google.com> | Wed Sep 02 14:33:41 2015 -0700 |
| committer | Casey Dahlin <sadmac@google.com> | Wed Sep 02 14:33:41 2015 -0700 |
| tree | 8559b7fa9de6f54f413a52348b0614f0513d2964 | |
| parent | bad130eed378891b82250d90aaf207088b4362e2 [diff] | |
| parent | 9483748aea526f1694e1054b9a2d0d9c9903735b [diff] |
resolved conflicts for merge of 9483748a to stage-aosp-master Change-Id: I82fd3a6ddeffc564915e43b23b81293adf1f9b5d