| commit | 9fbe94294ce2053d102ff5de89846a0c5015fb58 | [log] [tgz] |
|---|---|---|
| author | Ed Heyl <ed@google.com> | Sun Jul 29 16:47:58 2012 -0700 |
| committer | Ed Heyl <ed@google.com> | Sun Jul 29 16:47:58 2012 -0700 |
| tree | 7ba08233afeb658bdd59e1e0b12e96638ee796a4 | |
| parent | 3beb3ff4af08ea02da87e6548e0544d2ba47daf1 [diff] | |
| parent | 5d246efa220a7c7b22e490576c488b3853c664dd [diff] |
Merge remote-tracking branch 'goog/jb-dev-mako' into jb-mr1-dev Conflicts: services/audioflinger/AudioFlinger.cpp Change-Id: If27e4ff35de1e182394cc149e1557a49f0f7c95b