| commit | d84d9f861140299e88fe0168652728733d6f96b9 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Fri Jul 25 15:30:19 2014 -0700 |
| committer | Nick Kralevich <nnk@google.com> | Fri Jul 25 15:30:19 2014 -0700 |
| tree | efa121f6bd69ca4c7d617b0f1459c69e2d87f20b | |
| parent | d065f0483c89d18aa92f60646b3e0867072bc8ff [diff] |
resync with AOSP master Merge conflict resolution patch 11a29f295dd3c419462c3c09c6ea740289c9ffa6 inadvertently dropped a comment line. Pick it back up. Change-Id: I0f7a7cdbdacafb86610595ee616e84a06da50a17