OSDN Git Service

Merge "docs: Clarified structure of security config file." into mnc-mr-docs am: c3cada0
authorKevin Hufnagle <khufnagle@google.com>
Tue, 26 Apr 2016 08:01:43 +0000 (08:01 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 26 Apr 2016 08:01:43 +0000 (08:01 +0000)
commitd893d0c5c4dacc702c2bcbc84b2d6f93ed36fef7
tree28c401b1c9c68fe4d7c1dd5a5d7d5611dfbacf2e
parentc1877e7d7b283af7f580aca191598db0a5ba4db9
parent0e6f90e46150f04d86936f761202a7b689cbb2a7
Merge "docs: Clarified structure of security config file." into mnc-mr-docs am: c3cada0
am: 0e6f90e

* commit '0e6f90e46150f04d86936f761202a7b689cbb2a7':
  docs: Clarified structure of security config file.

Change-Id: I7a3b632ec88aff8124afa5f79b58d35bd12a8433