| commit | 747c480b0e3cf9401ff53421be6a82b23fdc04c2 | [log] [tgz] |
|---|---|---|
| author | Ed Heyl <ed@google.com> | Sat Jul 28 09:55:54 2012 -0700 |
| committer | Ed Heyl <ed@google.com> | Sat Jul 28 09:55:54 2012 -0700 |
| tree | 5dec2bd0b82021367c1707faaf11be7a0b4b719b | |
| parent | 657ea79b623101bd0ae540267645ecfd9a3e07ba [diff] | |
| parent | 72a36d876d81f0336173bc92996570db96cabd96 [diff] |
Merge remote-tracking branch 'goog/jb-dev-mako' into jb-mr1-dev Conflicts: include/media/hardware/CryptoAPI.h Change-Id: I84bf34edbef000558f088bbf1d1e5b55d6217d2e