| commit | 8256d7fdda333ecf9b2b99368935b8a3395a7d56 | [log] [tgz] |
|---|---|---|
| author | Svet Ganov <svetoslavganov@google.com> | Sun Jun 14 23:00:32 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Sun Jun 14 23:00:33 2015 +0000 |
| tree | 38230a93b65c2e3b7a3be2416d101b19ca631e3e | |
| parent | 270a8be2b93a227da075566f0fd0daa860f3aa2e [diff] | |
| parent | 3126041ba8bdfceddb28ed93f9c82f52122739cf [diff] |
Merge "resolved conflicts for merge of 0fcc46ac to mnc-ub-dev" into mnc-ub-dev