| commit | ebb17fece985e9f67c1ed3bec1c05b8a4a58f57c | [log] [tgz] |
|---|---|---|
| author | Jorge Lucangeli Obes <jorgelo@google.com> | Thu Jul 21 23:14:46 2016 -0400 |
| committer | Jorge Lucangeli Obes <jorgelo@google.com> | Thu Jul 21 23:14:46 2016 -0400 |
| tree | 0c2313167344569224b40101a355a2b0e2f59ebd | |
| parent | d149bab29316e84b977d3ee82b1618d19606d683 [diff] | |
| parent | cb89553909550d60f56ad48e2841dfce41a05b4d [diff] |
resolve merge conflicts of c6e22ba to stage-aosp-master Change-Id: I65550ff841d27f985a3ab8618ecdf4a3500fb0be