| commit | 9e155c8e6d3e4ef2d8e72645c0c254fa5863c18b | [log] [tgz] |
|---|---|---|
| author | Robert Greenwalt <rgreenwalt@google.com> | Mon Oct 27 18:32:25 2014 -0700 |
| committer | Robert Greenwalt <rgreenwalt@google.com> | Mon Oct 27 18:32:25 2014 -0700 |
| tree | 4caac208cb92c4e1fd50f23d3af4739091b03ed8 | |
| parent | a55cad7c14b310d06126d214b589c4a4ab94bcbd [diff] | |
| parent | 998568c312c50b618a1528a0558e0e6427e9fc1d [diff] |
resolved conflicts for merge of 998568c3 to stage-aosp-master Change-Id: I15e94f9fa1aced5673c0f8dbb055947613e98097