OSDN Git Service

resolved conflicts for merge of 7d971ec1 to lmp-mr1-dev-plus-aosp
authorDmitriy Ivanov <dimitry@google.com>
Thu, 2 Oct 2014 19:38:54 +0000 (12:38 -0700)
committerDmitriy Ivanov <dimitry@google.com>
Thu, 2 Oct 2014 19:38:54 +0000 (12:38 -0700)
commitfeaf85e34c0ab0a65096b183a6ae3144242d934b
tree484549be0374afa8fc99aa09c4e679466755297d
parentb5626827c9d62783737de163723e8f647eb6665f
parent7d971ec14b80cac442aeea8d88e9eb2e3ab6f214
resolved conflicts for merge of 7d971ec1 to lmp-mr1-dev-plus-aosp

Change-Id: I1cd01e5c0dd00cd55594654d53f7e0cb6edf35d9
tests/libs/Android.mk