Jorim Jaggi 249a45363a resolve merge conflicts of c55cce487c to master ...

Change-Id: If833e3c5efed891fb1ba7b32b2edc96a60ea2566

2017-08-22 13:28:57 +02:00

..

src

resolve merge conflicts of c55cce487c to master

2017-08-22 13:28:57 +02:00

Android.mk

Add host-side version of framework-protos.

2017-03-13 11:41:54 +00:00

jarjar-rules.txt

hide the nanos even harder

2016-02-23 11:10:44 -05:00