| commit | 094634dfe447bdef7340a8253200f1082ea849cf | [log] [tgz] |
|---|---|---|
| author | Rom Lemarchand <romlem@android.com> | Tue Jun 02 17:22:42 2015 -0700 |
| committer | Rom Lemarchand <romlem@google.com> | Tue Jun 02 17:22:42 2015 -0700 |
| tree | 126bd61eab6073750b459cc9f1feb557e0dfaa3e | |
| parent | 8eb93ca6eaceb6465cc61aaad82324fcec8f5852 [diff] | |
| parent | 15a024b417f320f64f35583dece7e85dbe597843 [diff] |
resolved conflicts for merge of 7982495f to mnc-dev-plus-aosp