| commit | 680e464d24f45f0911821386c5f7c6a1aca02bab | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Thu Aug 27 05:24:16 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 05:24:16 2015 +0000 |
| tree | 0c95cfa6c7fd28b15ac08f4d70497562fc384835 | |
| parent | 620d39bf521bafbb30992916ee14ac3092a2b91a [diff] | |
| parent | 55a422a30ffb085ee26d98cab71b785787b8dfae [diff] |
am 55a422a3: (-s ours) resolved conflicts for merge of 6dd63b23 to mnc-dev-plus-aosp * commit '55a422a30ffb085ee26d98cab71b785787b8dfae':