| commit | ed07dee75effc3c60c57aa90826aa48c98f4f3ff | [log] [tgz] |
|---|---|---|
| author | Yin-Chia Yeh <yinchiayeh@google.com> | Fri Jul 24 15:34:28 2015 -0700 |
| committer | Yin-Chia Yeh <yinchiayeh@google.com> | Fri Jul 24 15:34:28 2015 -0700 |
| tree | c4ebc65b13300dd5e011cabc062d6f9824e5218d | |
| parent | 366c8fe1bc480f2705475a43444cb70992d5f415 [diff] | |
| parent | fe9be8188835ef0ec7685dcae7a604ce36dfaead [diff] |
resolved conflicts for merge of fe9be818 to mnc-dev Change-Id: I8856439cdc3dd98b57732313ad703fe31ed1372c