| commit | 3cf0775dd1233eb52f3ff21ddff0a5e5e6631d66 | [log] [tgz] |
|---|---|---|
| author | Dan Willemsen <dwillemsen@google.com> | Mon Sep 28 14:33:14 2015 -0700 |
| committer | Dan Willemsen <dwillemsen@google.com> | Mon Sep 28 14:33:14 2015 -0700 |
| tree | bea6a7467c9ad110681eaac37537f72bb44888c7 | |
| parent | 536a38fe3317047e9b51813a04ae3a74c3df5d60 [diff] | |
| parent | ba95966e8bb579cdef665901617b76eadddb0ed9 [diff] |
resolved conflicts for ba95966e to stage-aosp-master Change-Id: Id468b025222853e5a421300b6e669de999bf737e