Google GitGoogle Git
Sign in
android/platform/external/libavc/37345554fea84afd446d6d8fbb87feea5a0dde3f
commit
37345554fea84afd446d6d8fbb87feea5a0dde3f
[log]
author
Marco Nelissen <marcone@google.com>
Tue Feb 14 13:49:07 2017 -0800
committer
Marco Nelissen <marcone@google.com>
Tue Feb 14 13:49:16 2017 -0800
tree
18bc7275acfac00b0f2a294c2180f0203408e686
parent
16fa990ce15cae5dcf3fac059cd18264f50881b2 [diff]
parent
3654ad0da5578f78fcf80958589f6995fe284d61 [diff]
resolve merge conflicts of 3654ad0 to mnc-dr-dev

Bug: 33818508
Bug: 34013472
Change-Id: I2e99cbceba1c00555d624e8975522725e362362b
tree: 18bc7275acfac00b0f2a294c2180f0203408e686
  1. common/
  2. decoder/
  3. encoder/
  4. test/
  5. Android.mk
  6. decoder.arm.mk
  7. decoder.arm64.mk
  8. decoder.mips.mk
  9. decoder.mips64.mk
  10. decoder.mk
  11. decoder.x86.mk
  12. decoder.x86_64.mk
  13. encoder.arm.mk
  14. encoder.arm64.mk
  15. encoder.mips.mk
  16. encoder.mips64.mk
  17. encoder.mk
  18. encoder.x86.mk
  19. encoder.x86_64.mk