| commit | e2b65aac015e610e9f48217f0d6abeb32aebb5d8 | [log] [tgz] |
|---|---|---|
| author | Jeff Sharkey <jsharkey@android.com> | Thu Aug 27 11:51:24 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:51:24 2015 +0000 |
| tree | 8c31250a527d15d67e52f8d8871ae6062178ee22 | |
| parent | b7525da9a6d65cc50bfa5fb150a8060b9c8c0955 [diff] | |
| parent | d5b3c0ef64dfc0637d9a43b9dbea91d11889d1b6 [diff] |
am fdf14874: (-s ours) resolved conflicts for merge of b9f438ff to mnc-dev-plus-aosp * commit 'fdf14874930e92933eda7c756fd3bfe1f5e6c09a':