| commit | 858bdb46a51cc462242c946351f75e6476307043 | [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 | d80259ec9b1b171d5507ea741071b903281134de [diff] | |
| parent | 7982495f79f293e893a266bbb7890fee4a691395 [diff] |
resolved conflicts for merge of 7982495f to mnc-dev-plus-aosp