tree fa3bfac5199567e9fa85d53f9a5a020339da46e9
parent 003771d1c0ad6c3c6cd0c82f787636111c9e193c
parent 2985f81d0dfa0e3ff790cb7637684b3919a6ca1c
author Dima Zavin <dima@android.com> 1314665991 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1314665991 -0700

am 2985f81d: Merge "libdiskconfig: add missing LOCAL_MODULE_TAGS"

* commit '2985f81d0dfa0e3ff790cb7637684b3919a6ca1c':
  libdiskconfig: add missing LOCAL_MODULE_TAGS