| commit | 74951a161e31c712c450897b3a99bc4625e5c179 | [log] [tgz] |
|---|---|---|
| author | Yin-Chia Yeh <yinchiayeh@google.com> | Fri Jul 24 22:38:07 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Jul 24 22:38:07 2015 +0000 |
| tree | adda8f8daa4fe8732e2a26eb879ee48886a86f2e | |
| parent | 21afdf1bbd34f86cf8f00b5ed3ab69d8b7e2e512 [diff] | |
| parent | ed07dee75effc3c60c57aa90826aa48c98f4f3ff [diff] |
Merge "resolved conflicts for merge of fe9be818 to mnc-dev" into mnc-dev