tree c64962ab41b26c63a425871c3673b6f559696429
parent 1c15b02b54d2b8d53bc33dbcac8dcb4597a71df9
parent 59bd65bdf685c1110453ddc4d48b88aad8783111
author Yifan Hong <elsk@google.com> 1527804306 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1527804306 +0000

Merge "androidboot.lrap => logical_partitions"