| commit | 4ed472ab33e78391c0b084ed3908019e06b7dfe5 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Wed Oct 29 12:12:37 2014 +0000 |
| committer | Narayan Kamath <narayan@google.com> | Wed Oct 29 12:12:37 2014 +0000 |
| tree | 2135110bff4085ec90113a260f0a7eac519ba76b | |
| parent | fa945c105b4f7bb3e3844e8ce467ca701d5f3a9f [diff] | |
| parent | 3028394c4691db9dec6bde04a7ed927e7501bd6a [diff] |
resolved conflicts for merge of 3028394c to stage-aosp-master Change-Id: I980e4c95cdc6a4778cef3298338692656d23e7c6