| commit | 718aefb6ff11d16ce7412c81e4d4d9c29124eead | [log] [tgz] |
|---|---|---|
| author | Jeff Brown <jeffbrown@google.com> | Thu May 30 18:02:31 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 30 18:02:31 2013 -0700 |
| tree | 009fc0852e115279a2f63965c0367a547eb4964b | |
| parent | c1e0ca9fee17cb56a992ae107d3b1aa534290b2d [diff] | |
| parent | 6474d8407cb1551608fc403861e11cf514f8558e [diff] |
am 6474d840: am 636af7a1: Merge "Rename CALLBACK_FLAG_ACTIVE_SCAN for clarity." into jb-mr2-dev * commit '6474d8407cb1551608fc403861e11cf514f8558e': Rename CALLBACK_FLAG_ACTIVE_SCAN for clarity.