| commit | 4e6369d7d9c0065d7b83ddaabd7ea8bc51b44fd8 | [log] [tgz] |
|---|---|---|
| author | Ed Tam <etam@google.com> | Sun Jul 05 17:08:03 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Jul 05 17:08:03 2015 +0000 |
| tree | e633fbf662ebac396360a6d2ee4ea80d5c000937 | |
| parent | 6c6fa7ea64fb9842c5196655e48a1ee4093129d8 [diff] | |
| parent | d962e8d59e74ae84dc2986adede5ef6f2afd5552 [diff] |
am d962e8d5: (-s ours) am 59be74fc: (-s ours) flo: update prebuilt kernel - DO NOT MERGE automerge: 467fd91 -s ours automerge: a304812 -s ours automerge: a6abad4 -s ours automerge: a5c8b46 -s ours * commit 'd962e8d59e74ae84dc2986adede5ef6f2afd5552': flo: update prebuilt kernel - DO NOT MERGE