OSDN Git Service

Fix build breakage due to bad rebase
authorMike Lockwood <lockwood@google.com>
Tue, 10 Jun 2014 23:52:39 +0000 (16:52 -0700)
committerMike Lockwood <lockwood@google.com>
Tue, 10 Jun 2014 23:52:39 +0000 (16:52 -0700)
commitd0bc21547cde6bbd8ef9139d2b8b9fb2b300ba8f
treef6d9af4a15121ff1a8922f49f1e407093cb52f57
parentb48d176a454377e02c6ae0e014746c0b28d6577c
Fix build breakage due to bad rebase

Change-Id: Ide8190f10add027b18a34bb2604d3cd407d94224
gki/common/gki.h
main/Android.mk