OSDN Git Service

am deba0610: Merge "Revert "Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f9...
authorAbhishek Arya <aarya@google.com>
Tue, 18 Aug 2015 01:45:49 +0000 (01:45 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 18 Aug 2015 01:45:49 +0000 (01:45 +0000)
commit073a656d7dd0b432e7c8d508745d9fb552955b9e
treee869c8904fae46cd6a7624e01bb04b7a69f39e68
parentaf46239a10921980f5030222dff147a592480248
parentdeba0610c89d54390c9d2d0a0f3b79fd7679779c
am deba0610: Merge "Revert "Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4"" into klp-dev

* commit 'deba0610c89d54390c9d2d0a0f3b79fd7679779c':
  Revert "Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4"