| commit | e77c8c6486bb8dcbcaed1d49463903a8570afc47 | [log] [tgz] |
|---|---|---|
| author | Etan Cohen <etancohen@google.com> | Fri Sep 16 18:41:31 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Sep 16 18:41:36 2016 +0000 |
| tree | 50e17027a949f85f8d816e38f90ef20bc0e32c1c | |
| parent | 79d27bdeacfa1e25ca2f4fa727c731ac15bd1cde [diff] | |
| parent | 302c37008f1c3aa4a62448411f1ceba5af56dc34 [diff] |
Merge changes from topic 'undo_do_not_merge' into stage-aosp-master * changes: Give WakeupMessage the ability to transport an object as well. [NAN] Add transport type for NAN.