| commit | 389bb7f509fc74de3656492a9c474c11bcc96e5b | [log] [tgz] |
|---|---|---|
| author | Todd Kennedy <toddke@google.com> | Fri Sep 25 22:17:06 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 25 22:17:06 2015 +0000 |
| tree | d86c03e691c75afbaef3d7d6df880a74e235ecd5 | |
| parent | 3197cd36fef11b1fdd59bdd341f65f9f2364ed2a [diff] | |
| parent | 9f8602644418ecfb1a5c9555792ceed285fa72bd [diff] |
am 9f860264: resolved conflicts for 7de7e0b0 to stage-aosp-master * commit '9f8602644418ecfb1a5c9555792ceed285fa72bd': Pass dexopt flags as integer