| commit | 335e0e08e9d9c0265e0f171dccf8d9a7790e2218 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Tue Sep 01 08:58:18 2015 -0700 |
| committer | Nick Kralevich <nnk@google.com> | Tue Sep 01 08:58:18 2015 -0700 |
| tree | 85758d8ba15bd38357c07782201e41db1f59b810 | |
| parent | e9a779bf5367ead7ddbd532828d8027a34b4748c [diff] | |
| parent | 3821feacada79dfd8af1546283a02251e93c9df8 [diff] |
resolved conflicts for merge of 3821feac to stage-aosp-master Change-Id: Icc17d2b7dc26eadf99b2c6967cceaa54ae38e617