OSDN Git Service

Merge "Compute PPID at ninja time" am: 82d4838d6b am: 6adda1d852 am: 79dbc88b60
authorColin Cross <ccross@android.com>
Tue, 4 Oct 2016 16:57:39 +0000 (16:57 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 4 Oct 2016 16:57:39 +0000 (16:57 +0000)
commitcb214ed72efddcda2cefdcf3f43a9e430d67702b
treee6005fa6e8d19c6c3df40753d2b1a574c7cf0c8b
parent4da5079feff3e3af57d68fd0835c91b6513c4e7c
parent53317a19a45dc232f63d0bc57c18e077ca54e233
Merge "Compute PPID at ninja time" am: 82d4838d6b am: 6adda1d852 am: 79dbc88b60
am: 53317a19a4

Change-Id: I979219e7ff1770763ec00090bb9aec4565508759