| commit | 957b60d89845178ff6f7dcdf728ceb22426dfdf0 | [log] [tgz] |
|---|---|---|
| author | Chih-Hung Hsieh <chh@google.com> | Thu Aug 27 05:10:10 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 05:10:10 2015 +0000 |
| tree | 79b172eedb64b17be773e36b13875c95a3ab56d0 | |
| parent | d06a77f2f8b84ccc8f651003d507dcca6f1c6bbf [diff] | |
| parent | 01ce4e0dfd73d2ec550e2efdb4fb228ca836083d [diff] |
am 01ce4e0d: (-s ours) resolved conflicts for merge of 0fa7bb8c to mnc-dev-plus-aosp * commit '01ce4e0dfd73d2ec550e2efdb4fb228ca836083d':