tree 18e955d7257543e3a2f4823a1cc74d4cfaa79c05
parent b69f863455261a656da02343e8b9d55110ecd45f
parent 2f9c5fd4b9676c59839c45bf4877551188dbc22a
author Michael Wright <michaelwr@google.com> 1377554587 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1377554587 -0700

am 2f9c5fd4: Merge "Add standard options to readlink" into klp-dev

* commit '2f9c5fd4b9676c59839c45bf4877551188dbc22a':
  Add standard options to readlink