commit | 127ab1fc2d6eab382d4464bc1b5b6cbd30bbc6d1 | [log] [tgz] |
---|---|---|
author | Tao Bao <tbao@google.com> | Thu May 28 16:25:37 2015 -0700 |
committer | Tao Bao <tbao@google.com> | Thu May 28 16:25:37 2015 -0700 |
tree | d7ba7bf8a7e275cf164e245b928c7509d4a52728 | |
parent | e938682e0ed9bc326b940bba31dc0c8472e81848 [diff] | |
parent | 158e11d6738a751b754d09df7275add589c31191 [diff] |
resolved conflicts for merge of 158e11d6 to mnc-dev-plus-aosp Change-Id: I164cdc4915b6ca1b623b206c0ccbb12e0fc3fa77