| commit | 5fc67f98b92ac1542eda7739ea9604cf69e18dc5 | [log] [tgz] |
|---|---|---|
| author | Adam Lesinski <adamlesinski@google.com> | Fri Sep 20 16:05:21 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 20 16:05:21 2013 -0700 |
| tree | 1102f449f24a649e7146095510a2f1c354ac7d83 | |
| parent | f439bcd953f34a1e5784ddc74d4fd093939ace85 [diff] | |
| parent | a35ff66127d07117e93268482d7e9719abfd58c3 [diff] |
am a35ff661: am d473ebb7: Merge "Surfaces ParcelFileDescriptor#parseMode() as API" into klp-dev * commit 'a35ff66127d07117e93268482d7e9719abfd58c3': Surfaces ParcelFileDescriptor#parseMode() as API