| commit | fe47ca9315c4796fc2fc06e0a4f905819432811b | [log] [tgz] |
|---|---|---|
| author | Jeff Vander Stoep <jeffv@google.com> | Sun Jul 09 13:52:40 2017 -0700 |
| committer | Jeffrey Vander Stoep <jeffv@google.com> | Mon Jul 10 00:17:43 2017 +0000 |
| tree | cb9209493154f29fb33355ace45479720ff475c6 | |
| parent | e820c804c5f2df30094db7190bf4ecc4c9683931 [diff] | |
| parent | 7e29d17754156636a79c60f7ce195039b94d7197 [diff] |
resolve merge conflicts of 7e29d177 to stage-aosp-master Test: build Merged-In: If42b6cb1bf9ffb3dd04f557279efdc37e1ac259a Change-Id: Ic30cc01f0abc26347d3747b51d1998f7815fea99