| commit | 53a19bb967f45ddfb80699865dc30094024343f6 | [log] [tgz] |
|---|---|---|
| author | Yusuke Sato <yusukes@google.com> | Mon Jun 29 13:09:51 2015 -0700 |
| committer | Yusuke Sato <yusukes@google.com> | Mon Jun 29 13:09:51 2015 -0700 |
| tree | 2a62eaf57ecc5c06010e372c886425df361a2d2c | |
| parent | 0515ad6ac0806d88ac371730c064a0ae5bc5db42 [diff] | |
| parent | d3d6e9a37e86e386988b84120d53cf52192dbc21 [diff] |
resolved conflicts for merge of d3d6e9a3 to mnc-dev-plus-aosp Change-Id: Ie32db11e6c1062df32b16a5cd6fcd219e0bdc017