| commit | e79b108ffa962c92bc14ff47f5078f453ee0c07f | [log] [tgz] |
|---|---|---|
| author | Michael Wright <michaelwr@google.com> | Mon Mar 23 22:39:02 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 23 22:39:02 2015 +0000 |
| tree | 48850f33184b22e8760dec79835bf064f986f749 | |
| parent | 52d28f9471561cb6614460f4f0b3873a60a92a94 [diff] | |
| parent | 0242b4f8f6457b7cfb5efc6105ff7cd4b3bff849 [diff] |
am 0242b4f8: am 7dda1047: am e9860761: am 2503a62b: Merge "Have the MediaProjection sample use the callback." into lmp-mr1-dev * commit '0242b4f8f6457b7cfb5efc6105ff7cd4b3bff849':