commit | 158e8f3613093fdf7b146cab89b08e8dc457a903 | [log] [tgz] |
---|---|---|
author | Jeff Sharkey <jsharkey@android.com> | Mon Jun 04 14:01:44 2012 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 04 14:01:44 2012 -0700 |
tree | 2a36e4d8330f4925e29dfa70e7ea225b42c9b771 | |
parent | 033f07ad2e328f40c44cdd253f4cce872c357e3c [diff] | |
parent | c9ed2f4706fa46e41a6ebbcd9a529d75c1ac84c5 [diff] |
am c9ed2f47: (-s ours) Allow additional interface flags. Do not merge * commit 'c9ed2f4706fa46e41a6ebbcd9a529d75c1ac84c5': Allow additional interface flags. Do not merge