| commit | 6959ec6b64f167fe8f76b373f709285c2e3e665d | [log] [tgz] |
|---|---|---|
| author | Jeff Sharkey <jsharkey@android.com> | Thu Aug 27 14:32:31 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 14:32:31 2015 +0000 |
| tree | 5672430a9f41c6eb948db44ee1706bd3fb354ba9 | |
| parent | 6c71071a8a2d816536cd84c98853db778a6ddd7b [diff] | |
| parent | e2b65aac015e610e9f48217f0d6abeb32aebb5d8 [diff] |
am e332a15a: am fdf14874: (-s ours) resolved conflicts for merge of b9f438ff to mnc-dev-plus-aosp * commit 'e332a15ad7e82289fb5d0dd17579d9a925bb2ce6':