| commit | 32d6e5f0ebe9e00f80401e5f4fd6e285a474590d | [log] [tgz] |
|---|---|---|
| author | Chih-Hung Hsieh <chh@google.com> | Fri Aug 12 13:46:48 2016 -0700 |
| committer | Chih-Hung Hsieh <chh@google.com> | Fri Aug 12 13:53:20 2016 -0700 |
| tree | 3bdd56b0b9b65ec35caa4a976c76ad9d4214cfbd | |
| parent | 311f99eade1222575bc65a2fcbd9f9a5a40d2024 [diff] | |
| parent | 6ae8c7bc1fd68dc810155df7021fde26a2b2414c [diff] |
resolve merge conflicts of 6ae8c7b to stage-aosp-master Change-Id: Iabb5d9b93b98e428c53f0504fbfe832ed24d988d