Google GitGoogle Git
Sign in
android/platform/cts/1004ed31460cb5b1c40ba1a584b96e34e3ced3cc
commit
1004ed31460cb5b1c40ba1a584b96e34e3ced3cc
[log]
author
Daniel Xie <dxie@google.com>
Mon Sep 28 22:59:30 2015 -0700
committer
Daniel Xie <dxie@google.com>
Mon Sep 28 22:59:30 2015 -0700
tree
21678ca25ac653006629b737234db5dc16546620
parent
b553f3c2f9f2deb58c7e1692a044426131178f52 [diff]
parent
ed0ccb8a008f43cb6d4acdf54e9d2eabb2817758 [diff]
resolved conflicts for ed0ccb8a to mnc-dev

Change-Id: I0938cf7bf1cfacc29083692907e8be20811d36cb
tree: 21678ca25ac653006629b737234db5dc16546620
  1. apps/
  2. build/
  3. common/
  4. development/
  5. hostsidetests/
  6. libs/
  7. suite/
  8. tests/
  9. tools/
  10. .gitignore
  11. Android.mk
  12. CleanSpec.mk
  13. CtsBuild.mk
  14. CtsCoverage.mk
  15. CtsTestCaseList.mk