| commit | 5f551b3fdc10e38276eab7737c5d8035fb3b1299 | [log] [tgz] |
|---|---|---|
| author | Dan Willemsen <dwillemsen@google.com> | Thu Jun 16 09:54:28 2016 -0700 |
| committer | Dan Willemsen <dwillemsen@google.com> | Thu Jun 16 09:54:28 2016 -0700 |
| tree | 9bae5cd6cb7e749d51d4f3802ba18e88d4bd3ae4 | |
| parent | 438dc91a41ee90f5f219c0502a2be781a2150e39 [diff] | |
| parent | 20d55a7779cd5e22e8aab51193a91e486b17d21b [diff] |
resolve merge conflicts of 20d55a7 to stage-aosp-master Change-Id: Ie2a1beb527ab60f8a3966a14e66330e69a148b59